Remove GDK_GC_FONT

diff --git a/docs/reference/gdk/tmpl/gcs.sgml b/docs/reference/gdk/tmpl/gcs.sgml
index 2897bcb35f103226285bbd085a129185ee700c5a..2d90ed4c378dccf9e22b2b261867fac86e02094b 100644 (file)
--- a/docs/reference/gdk/tmpl/gcs.sgml
+++ b/docs/reference/gdk/tmpl/gcs.sgml
@@ -79,7 +79,6 @@ A set of bit flags used to indicate which fields
 
 @GDK_GC_FOREGROUND: the @foreground is set.
 @GDK_GC_BACKGROUND: the @background is set.
-@GDK_GC_FONT: the @font is set.
 @GDK_GC_FUNCTION: the @function is set.
 @GDK_GC_FILL: the @fill is set.
 @GDK_GC_TILE: the @tile is set.

diff --git a/gdk/gdkgc.h b/gdk/gdkgc.h
index 3292beae09318838e702b290f869ad216dbbe9e0..962b1331e3e43e504a61930fbb3e85e5cb219fbb 100644 (file)
--- a/gdk/gdkgc.h
+++ b/gdk/gdkgc.h
@@ -139,22 +139,21 @@ typedef enum
 {
   GDK_GC_FOREGROUND    = 1 << 0,
   GDK_GC_BACKGROUND    = 1 << 1,
-  GDK_GC_FONT         = 1 << 2,
-  GDK_GC_FUNCTION      = 1 << 3,
-  GDK_GC_FILL         = 1 << 4,
-  GDK_GC_TILE         = 1 << 5,
-  GDK_GC_STIPPLE       = 1 << 6,
-  GDK_GC_CLIP_MASK     = 1 << 7,
-  GDK_GC_SUBWINDOW     = 1 << 8,
-  GDK_GC_TS_X_ORIGIN   = 1 << 9,
-  GDK_GC_TS_Y_ORIGIN   = 1 << 10,
-  GDK_GC_CLIP_X_ORIGIN = 1 << 11,
-  GDK_GC_CLIP_Y_ORIGIN = 1 << 12,
-  GDK_GC_EXPOSURES     = 1 << 13,
-  GDK_GC_LINE_WIDTH    = 1 << 14,
-  GDK_GC_LINE_STYLE    = 1 << 15,
-  GDK_GC_CAP_STYLE     = 1 << 16,
-  GDK_GC_JOIN_STYLE    = 1 << 17
+  GDK_GC_FUNCTION      = 1 << 2,
+  GDK_GC_FILL         = 1 << 3,
+  GDK_GC_TILE         = 1 << 4,
+  GDK_GC_STIPPLE       = 1 << 5,
+  GDK_GC_CLIP_MASK     = 1 << 6,
+  GDK_GC_SUBWINDOW     = 1 << 7,
+  GDK_GC_TS_X_ORIGIN   = 1 << 8,
+  GDK_GC_TS_Y_ORIGIN   = 1 << 9,
+  GDK_GC_CLIP_X_ORIGIN = 1 << 10,
+  GDK_GC_CLIP_Y_ORIGIN = 1 << 11,
+  GDK_GC_EXPOSURES     = 1 << 12,
+  GDK_GC_LINE_WIDTH    = 1 << 13,
+  GDK_GC_LINE_STYLE    = 1 << 14,
+  GDK_GC_CAP_STYLE     = 1 << 15,
+  GDK_GC_JOIN_STYLE    = 1 << 16
 } GdkGCValuesMask;
 
 struct _GdkGCValues

diff --git a/gdk/win32/gdkdrawable-win32.c b/gdk/win32/gdkdrawable-win32.c
index 36bd84a34a8f9d08d9f0206598ccffc808d0fc7d..5839da92debcb32a9ddb7316e2919580acce3d88 100644 (file)
--- a/gdk/win32/gdkdrawable-win32.c
+++ b/gdk/win32/gdkdrawable-win32.c
@@ -574,10 +574,6 @@ generic_draw (GdkDrawable    *drawable,
          drawing_mask |= LINE_ATTRIBUTES;
        }
 
-      /* Ditto, if the drawing function draws text, set up for that. */
-      if (mask & GDK_GC_FONT)
-       drawing_mask |= GDK_GC_FONT;
-
       mask_hdc = gdk_win32_hdc_get (mask_pixmap, mask_gc, drawing_mask);
       (*function) (GDK_GC_WIN32 (mask_gc), mask_hdc,
                   region->extents.x1, region->extents.y1, args);

diff --git a/gdk/win32/gdkgc-win32.c b/gdk/win32/gdkgc-win32.c
index a0fd152dafdc30b57e97763a57fa49875d93af46..148a0f5eb995cfad8b5798b3bad222edd85bf287 100644 (file)
--- a/gdk/win32/gdkgc-win32.c
+++ b/gdk/win32/gdkgc-win32.c
@@ -744,11 +744,6 @@ get_impl_drawable (GdkDrawable *drawable)
  * width and stule is created and selected into the HDC. Note that the
  * dash properties are not completely implemented.
  *
- * If the %GDK_GC_FONT flag is set, the background mix mode is set to
- * %TRANSPARENT. and the text alignment is set to
- * %TA_BASELINE|%TA_LEFT. Note that no font gets selected into the HDC
- * by this function.
- *
  * Some things are done regardless of @mask: If the function in @gc is
  * any other than %GDK_COPY, the raster operation of the HDC is
  * set. If @gc has a clip mask, the clip region of the HDC is set.
@@ -846,15 +841,6 @@ gdk_win32_hdc_get (GdkDrawable    *drawable,
        }
     }
 
-  if (ok && (usage & GDK_GC_FONT))
-    {
-      if (SetBkMode (win32_gc->hdc, TRANSPARENT) == 0)
-       WIN32_GDI_FAILED ("SetBkMode"), ok = FALSE;
-  
-      if (ok && SetTextAlign (win32_gc->hdc, TA_BASELINE|TA_LEFT|TA_NOUPDATECP) == GDI_ERROR)
-       WIN32_GDI_FAILED ("SetTextAlign"), ok = FALSE;
-    }
-  
   if (ok && win32_gc->rop2 != R2_COPYPEN)
     if (SetROP2 (win32_gc->hdc, win32_gc->rop2) == 0)
       WIN32_GDI_FAILED ("SetROP2"), ok = FALSE;